[Backport 8.4] Community backports for 8.1.3 #7805
+156
−100
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.